gnomeos: Refactor build so we can have separate runtime/devel images

diff --git a/gnomeos/yocto/classes/gnomeos-contents.bbclass b/gnomeos/yocto/classes/gnomeos-contents.bbclass
new file mode 100644 (file)
index 0000000..b84c148
--- /dev/null
+++ b/gnomeos/yocto/classes/gnomeos-contents.bbclass
@@ -0,0 +1,100 @@
+#
+# Copyright (C) 2011 Colin Walters <walters@verbum.org>
+#
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit rootfs_${IMAGE_PKGTYPE}
+
+PACKAGE_INSTALL = "task-core-boot \
+                  coreutils \
+                  ostree ostree-init \
+                  strace \
+                  python-core python-misc"
+
+RDEPENDS += "${PACKAGE_INSTALL}"
+DEPENDS += "makedevs-native virtual/fakeroot-native"
+
+EXCLUDE_FROM_WORLD = "1"
+
+do_rootfs[nostamp] = "1"
+do_rootfs[dirs] = "${TOPDIR}"
+do_rootfs[lockfiles] += "${IMAGE_ROOTFS}.lock"
+do_build[nostamp] = "1"
+do_rootfs[umask] = 022
+
+def gnomeos_get_devtable_list(d):
+    return bb.which(d.getVar('BBPATH', 1), 'files/device_table-minimal.txt')
+
+# Must call real_do_rootfs() from inside here, rather than as a separate
+# task, so that we have a single fakeroot context for the whole process.
+fakeroot do_rootfs () {
+        set -x
+       rm -rf ${IMAGE_ROOTFS}
+       rm -rf ${MULTILIB_TEMP_ROOTFS}
+       mkdir -p ${IMAGE_ROOTFS}
+       mkdir -p ${DEPLOY_DIR_IMAGE}
+
+       rootfs_${IMAGE_PKGTYPE}_do_rootfs
+
+       # We use devtmpfs
+       rm -f ${IMAGE_ROOTFS}/etc/init.d/udev-cache
+       rm -f ${IMAGE_ROOTFS}/etc/rc*.d/*udev-cache*
+
+       # The default fstab has /, which we don't want, and we do want /sys and /dev/shm
+       cat > ${IMAGE_ROOTFS}/etc/fstab << EOF
+tmpfs                   /dev/shm                tmpfs   defaults        0 0
+devpts                  /dev/pts                devpts  gid=5,mode=620  0 0
+sysfs                   /sys                    sysfs   defaults        0 0
+proc                    /proc                   proc    defaults        0 0
+EOF
+
+
+       ln -sf /var/run/resolv.conf ${IMAGE_ROOTFS}/etc/resolv.conf
+
+       TOPROOT_BIND_MOUNTS="home root tmp"
+       OSTREE_BIND_MOUNTS="var"
+       OSDIRS="dev proc mnt media sys sysroot"
+       READONLY_BIND_MOUNTS="bin etc lib sbin usr"
+       
+       rm -rf ${WORKDIR}/gnomeos-contents
+       mkdir ${WORKDIR}/gnomeos-contents
+        cd ${WORKDIR}/gnomeos-contents
+       for d in $TOPROOT_BIND_MOUNTS $OSTREE_BIND_MOUNTS $OSDIRS; do
+           mkdir $d
+       done
+       chmod a=rwxt tmp
+       for d in $READONLY_BIND_MOUNTS; do
+            mv ${IMAGE_ROOTFS}/$d .
+       done
+       rm -rf ${IMAGE_ROOTFS}
+       mv ${WORKDIR}/gnomeos-contents ${IMAGE_ROOTFS}
+
+       DEST=${IMAGE_NAME}.rootfs.tar.gz
+       (cd ${IMAGE_ROOTFS} && tar -zcv -f ${WORKDIR}/$DEST .)
+       echo "Created $DEST"
+       mv ${WORKDIR}/$DEST ${DEPLOY_DIR_IMAGE}/
+       cd ${DEPLOY_DIR_IMAGE}/
+       rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.tar.gz
+       ln -s ${IMAGE_NAME}.rootfs.tar.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.tar.gz
+       echo "Created ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.tar.gz"
+}
+
+log_check() {
+       true
+}
+
+do_fetch[noexec] = "1"
+do_unpack[noexec] = "1"
+do_patch[noexec] = "1"
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+do_install[noexec] = "1"
+do_populate_sysroot[noexec] = "1"
+do_package[noexec] = "1"
+do_package_write_ipk[noexec] = "1"
+do_package_write_deb[noexec] = "1"
+do_package_write_rpm[noexec] = "1"
+
+addtask rootfs before do_build

diff --git a/gnomeos/yocto/recipies-core/images/gnomeos-contents-base.bb b/gnomeos/yocto/recipies-core/images/gnomeos-contents-base.bb
new file mode 100644 (file)
index 0000000..d70a704
--- /dev/null
+++ b/gnomeos/yocto/recipies-core/images/gnomeos-contents-base.bb
@@ -0,0 +1,8 @@
+#
+# Copyright (C) 2011 Colin Walters <walters@verbum.org>
+#
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit gnomeos-contents

diff --git a/gnomeos/yocto/recipies-core/images/gnomeos-contents-dev.bb b/gnomeos/yocto/recipies-core/images/gnomeos-contents-dev.bb
new file mode 100644 (file)
index 0000000..ff8d2aa
--- /dev/null
+++ b/gnomeos/yocto/recipies-core/images/gnomeos-contents-dev.bb
@@ -0,0 +1,10 @@
+#
+# Copyright (C) 2011 Colin Walters <walters@verbum.org>
+#
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit gnomeos-contents
+
+PACKAGE_INSTALL += "task-core-sdk"

diff --git a/gnomeos/yocto/recipies-core/images/gnomeos-image-contents.bb b/gnomeos/yocto/recipies-core/images/gnomeos-image-contents.bb
deleted file mode 100644 (file)
index 63b661b..0000000
--- a/gnomeos/yocto/recipies-core/images/gnomeos-image-contents.bb
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Copyright (C) 2011 Colin Walters <walters@verbum.org>
-#
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-inherit rootfs_${IMAGE_PKGTYPE}
-
-PACKAGE_INSTALL = "task-core-boot \
-                  coreutils \
-                  ostree ostree-init \
-                  strace"
-
-RDEPENDS += "${PACKAGE_INSTALL}"
-DEPENDS += "makedevs-native virtual/fakeroot-native"
-
-EXCLUDE_FROM_WORLD = "1"
-
-do_rootfs[nostamp] = "1"
-do_rootfs[dirs] = "${TOPDIR}"
-do_rootfs[lockfiles] += "${IMAGE_ROOTFS}.lock"
-do_build[nostamp] = "1"
-do_rootfs[umask] = 022
-
-def gnomeos_get_devtable_list(d):
-    return bb.which(d.getVar('BBPATH', 1), 'files/device_table-minimal.txt')
-
-# Must call real_do_rootfs() from inside here, rather than as a separate
-# task, so that we have a single fakeroot context for the whole process.
-fakeroot do_rootfs () {
-        set -x
-       rm -rf ${IMAGE_ROOTFS}
-       rm -rf ${MULTILIB_TEMP_ROOTFS}
-       mkdir -p ${IMAGE_ROOTFS}
-       mkdir -p ${DEPLOY_DIR_IMAGE}
-
-       rootfs_${IMAGE_PKGTYPE}_do_rootfs
-
-       # We use devtmpfs
-       rm -f ${IMAGE_ROOTFS}/etc/init.d/udev-cache
-       rm -f ${IMAGE_ROOTFS}/etc/rc*.d/*udev-cache*
-
-       # The default fstab has /, which we don't want, and we do want /sys and /dev/shm
-       cat > ${IMAGE_ROOTFS}/etc/fstab << EOF
-tmpfs                   /dev/shm                tmpfs   defaults        0 0
-devpts                  /dev/pts                devpts  gid=5,mode=620  0 0
-sysfs                   /sys                    sysfs   defaults        0 0
-proc                    /proc                   proc    defaults        0 0
-EOF
-
-
-       ln -sf /var/run/resolv.conf ${IMAGE_ROOTFS}/etc/resolv.conf
-
-       TOPROOT_BIND_MOUNTS="home root tmp"
-       OSTREE_BIND_MOUNTS="var"
-       OSDIRS="dev proc mnt media sys sysroot"
-       READONLY_BIND_MOUNTS="bin etc lib sbin usr"
-       
-       rm -rf ${WORKDIR}/gnomeos-contents
-       mkdir ${WORKDIR}/gnomeos-contents
-        cd ${WORKDIR}/gnomeos-contents
-       for d in $TOPROOT_BIND_MOUNTS $OSTREE_BIND_MOUNTS $OSDIRS; do
-           mkdir $d
-       done
-       chmod a=rwxt tmp
-       for d in $READONLY_BIND_MOUNTS; do
-            mv ${IMAGE_ROOTFS}/$d .
-       done
-       rm -rf ${IMAGE_ROOTFS}
-       mv ${WORKDIR}/gnomeos-contents ${IMAGE_ROOTFS}
-
-       DEST=${IMAGE_NAME}.rootfs.tar.gz
-       (cd ${IMAGE_ROOTFS} && tar -zcv -f ${WORKDIR}/$DEST .)
-       echo "Created $DEST"
-       mv ${WORKDIR}/$DEST ${DEPLOY_DIR_IMAGE}/
-       cd ${DEPLOY_DIR_IMAGE}/
-       rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.tar.gz
-       ln -s ${IMAGE_NAME}.rootfs.tar.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.tar.gz
-       echo "Created ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.tar.gz"
-}
-
-log_check() {
-       true
-}
-
-do_fetch[noexec] = "1"
-do_unpack[noexec] = "1"
-do_patch[noexec] = "1"
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-do_install[noexec] = "1"
-do_populate_sysroot[noexec] = "1"
-do_package[noexec] = "1"
-do_package_write_ipk[noexec] = "1"
-do_package_write_deb[noexec] = "1"
-do_package_write_rpm[noexec] = "1"
-
-addtask rootfs before do_build